[pull] main from MetaMask:main#384
Merged
Merged
Conversation
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** Fixes the network ordering to include Tron between Solana and Base <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: Updated swaps network picker ordering ## **Related issues** Fixes: #23687 ## **Manual testing steps** ```gherkin Feature: my feature name Scenario: user [verb for user action] Given [describe expected initial app state] When user [verb for user action] Then [describe expected outcome] ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Adds Tron to bridge networks, positions it after Solana in popularity ordering, and includes TRX in source network balance sorting and tests. > > - **Bridge UI**: > - Update `BridgeDestNetworksBar.tsx` `ChainPopularity` to include `TrxScope.Mainnet` after `SolScope.Mainnet` and shift subsequent rankings. > - **Sorting/Logic**: > - Extend `useSortedSourceNetworks` to compute/sort by Tron (`TrxScope.Mainnet`) fiat totals alongside Solana and Bitcoin. > - **Mocks/State**: > - Add Tron account, native asset (`tron:728126428/slip44:195`), balances, metadata, rates, and controller entries in `_mocks_/initialState.ts`. > - **Tests/Snapshots**: > - Update selectors and snapshots to display/select Tron across source/dest network and token selectors; adjust expectations to include `TrxScope.Mainnet`. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit ed48008. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** This PR adds `account_hardware_type` to transaction events when the account is a hardware account. <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: null ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/MUL-1259?atlOrigin=eyJpIjoiNGE0MjcyYTY0YjE0NGEyNGEwNWVjZGYwYWMzYjFkMWEiLCJwIjoiaiJ9 ## **Manual testing steps** ```gherkin Feature: my feature name Scenario: user [verb for user action] Given [describe expected initial app state] When user [verb for user action] Then [describe expected outcome] ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** No visual changes. <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Adds `account_hardware_type` to transaction metrics and standardizes QR account type to "QR Hardware", updating analytics usage and tests. > > - **Analytics/Transactions**: > - Add `account_hardware_type` to `generateDefaultTransactionMetrics` in `transaction-controller/utils.ts`; populated when `isHardwareAccount(from)` is true, else `null`. > - Update tests in `transaction-controller/utils.test.ts` to expect `account_hardware_type`, add hardware wallet scenarios, and refactor address mocks. > - **Address utilities**: > - Change `getAddressAccountType` to return `"QR Hardware"` for `qr` keyrings in `app/util/address/index.ts` and update related tests. > - **UI Analytics**: > - In `EditAccountName.tsx`, map `account_type` to `hardware` when type is `"QR Hardware"` for the ACCOUNT_RENAMED event. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 8e4d25d. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: Charly Chevalier <charlyy.chevalier@gmail.com>
…stom network status (#23613) <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** This PR adds additional properties to the NETWORK_SWITCHED analytics event to improve network switching tracking. The changes include: 1. Adding from_network and to_network as chain IDs (hex format) instead of network names 2. Adding custom_network boolean flag to indicate if the target network is a custom (non-popular) network Removing the selectedNetworkName parameter from useSwitchNetworks hook as it's no longer needed These changes apply to network switching from: - Network Selector modal - Network Permissions Connected component (dApp permission flow) - RPC method calls (wallet_switchEthereumChain) ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 3. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: null ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/TMCU-213 ## **Manual testing steps** ```gherkin Feature: Network Switched Analytics Event Scenario: user switches network from Network Selector Given user is on any screen with network selector accessible When user opens the network selector and switches to a different network Then the NETWORK_SWITCHED event should contain chain_id, from_network, to_network, and custom_network properties Scenario: user switches network via dApp permission Given user is connected to a dApp with network permissions When user switches network through the network permissions modal Then the NETWORK_SWITCHED event should contain chain_id, from_network (hex), to_network (hex), and custom_network (boolean) Scenario: dApp requests network switch via RPC Given user is connected to a dApp When the dApp calls wallet_switchEthereumChain Then the NETWORK_SWITCHED event should include from_network, to_network, and custom_network properties ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Unifies NETWORK_SWITCHED analytics to report from/to chain IDs and a custom_network flag across UI flows and RPC, with tests updated accordingly. > > - **Analytics/metrics** > - Standardize `MetaMetricsEvents.NETWORK_SWITCHED` properties across network switching flows: > - `from_network` and `to_network` now use chain IDs (hex) instead of names. > - Add `custom_network` boolean based on `POPULAR_NETWORK_CHAIN_IDS`. > - Ensure `chain_id` reflects the target chain (decimal where applicable). > - Apply changes in: > - `app/components/Views/AccountPermissions/.../NetworkPermissionsConnected.tsx` (remove `selectProviderConfig`; track using `evmChainId` → `targetChainId`). > - `app/components/Views/NetworkSelector/useSwitchNetworks.ts` (remove `selectedNetworkName`; track with `selectedChainId` → `chainId`/built-ins; add popularity check). > - `app/core/RPCMethods/lib/ethereum-chain-utils.js` (include `from_network`, `to_network`, `custom_network`). > - **Tests** > - Update `ethereum-chain-utils.test.ts` to assert new analytics fields (`from_network`, `to_network`, `custom_network`). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit df07c0b. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )